Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removing "BibTeX" when not specific to BibTeX #6983

Merged
merged 10 commits into from
Oct 6, 2020
Merged

Removing "BibTeX" when not specific to BibTeX #6983

merged 10 commits into from
Oct 6, 2020

Conversation

mlep
Copy link
Contributor

@mlep mlep commented Oct 5, 2020 •
edited
Loading

Following JabRef/user-documentation#315 , "Generate groups from keywords in a BibTeX field" is changed to "Generate groups from keywords in the following field" (because it works for both BibTeX and biblatex fields).
Additional changes for similar issues

@mlep mlep marked this pull request as draft October 5, 2020 08:51
@mlep mlep changed the title BibTeX and biblatex field ==> Use "following field" [WIP] BibTeX and biblatex field ==> Use "following field" Oct 5, 2020
@mlep mlep changed the title [WIP] BibTeX and biblatex field ==> Use "following field" Replacing "BibTeX" when not specific to BibTeX Oct 5, 2020
@mlep mlep marked this pull request as ready for review October 5, 2020 09:17
@mlep mlep changed the title Replacing "BibTeX" when not specific to BibTeX Removing "BibTeX" when not specific to BibTeX Oct 5, 2020
tobiasdiez
tobiasdiez approved these changes Oct 5, 2020
View reviewed changes
Copy link
Member

@tobiasdiez tobiasdiez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, LGTM.

src/main/java/org/jabref/gui/groups/GroupDialog.fxml Outdated Show resolved Hide resolved
@calixtus
Copy link
Member

calixtus commented Oct 6, 2020 •
edited
Loading

markdown-lint is complaining: CHANGELOG.md:50:154 MD009/no-trailing-spaces Trailing spaces [Expected: 0 or 2; Actual: 1]

also localizationConsistencyTest is failing: expected: but was:
-> The localized string needs to be exactly the same as the string before the equal sign (including capital letters), except the escape characters

@mlep
Copy link
Contributor Author

mlep commented Oct 6, 2020

markdown-lint is complaining: CHANGELOG.md:50:154 MD009/no-trailing-spaces Trailing spaces [Expected: 0 or 2; Actual: 1]

also localizationConsistencyTest is failing: expected: but was:
-> The localized string needs to be exactly the same as the string before the equal sign (including capital letters), except the escape characters

@calixtus Thanks for pointing me to these 2 types of failing checks. I could solve the one about localization, but I am not able to find a trailing space in my changes to in changelog.md ...
Please, could you get a look and step in?

@tobiasdiez
Copy link
Member

I think (and hope) that's a false positive. The error message also doesn't make any sense as there are not 154 characters on line 50. So I'll merge now, in the hope the test passes in master.

@tobiasdiez tobiasdiez merged commit d7e39f3 into JabRef:master Oct 6, 2020
@mlep mlep deleted the patch-1 branch October 7, 2020 07:11
Siedlerchr added a commit that referenced this pull request Oct 17, 2020
@Siedlerchr
Merge remote-tracking branch 'upstream/master' into writebackupToTemp
7600ea2 
* upstream/master: (58 commits)
  remove any newlines and spaces in isbn when fetching (#7023)
  add exception to error handler in integrity check
  Update journalList.mv
  Update to javafx15 (#7018)
  Squashed 'src/main/resources/csl-styles/' changes from 6fab78b..5297abd
  try to fix DEP issue with official jdk (#7008)
  Jstor Fetcher (#6992)
  Group: "Searching for keywords" searches for a single keyword ==> use singular (#6995)
  Merge parsing of bracketed patterns (#6989)
  6848 fixed the issue of clicking collapse all expanding tree (#6993)
  Enable auto sync per default for Open/Libre Office (#6985)
  Bump unirest-java from 3.11.00 to 3.11.01 (#7001)
  Bump byte-buddy-parent from 1.10.16 to 1.10.17 (#7004)
  Bump lucene-queryparser from 8.6.2 to 8.6.3 (#7002)
  Bump postgresql from 42.2.16 to 42.2.17 (#7005)
  Bump pascalgn/automerge-action from v0.11.0 to v0.12.0 (#7006)
  Bump flowless from 0.6.1 to 0.6.2 (#7003)
  Rewrite guidelines to Java 15 (#6973)
  Lint CHANGELOG.md
  Removing "BibTeX" when not specific to BibTeX (#6983)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tobiasdiez tobiasdiez tobiasdiez approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mlep @calixtus @tobiasdiez